From 4d95dee0108574d27a88068b56356d73b3a38a5d Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Fri, 24 Feb 2006 11:08:51 -0700 Subject: [PATCH] [IA64] redefine raw_smp_processor_id() There are two definitions of raw_smp_processor_id() One is in file xen/include/asm-ia64/linux/asm/smp.h #define raw_smp_processor_id() (current_thread_info()->cpu) The other is in file /xen/include/asm-ia64/config.h #define raw_smp_processor_id() current->processor In fact, the first one takes effect, that's not correct. Signed-off-by: Anthony Xu --- xen/include/asm-ia64/config.h | 10 +++++----- xen/include/asm-ia64/linux-xen/asm/README.origin | 1 + xen/include/asm-ia64/{linux => linux-xen}/asm/smp.h | 4 ++++ xen/include/asm-ia64/linux/asm/README.origin | 1 - 4 files changed, 10 insertions(+), 6 deletions(-) rename xen/include/asm-ia64/{linux => linux-xen}/asm/smp.h (97%) diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h index 7b2667b9c3..3ca2f12fe9 100644 --- a/xen/include/asm-ia64/config.h +++ b/xen/include/asm-ia64/config.h @@ -293,11 +293,11 @@ extern int ht_per_core; #endif /* __XEN_IA64_CONFIG_H__ */ // needed for include/xen/smp.h -#ifdef CONFIG_SMP -#define raw_smp_processor_id() current->processor -#else -#define raw_smp_processor_id() 0 -#endif +//#ifdef CONFIG_SMP +//#define raw_smp_processor_id() current->processor +//#else +//#define raw_smp_processor_id() 0 +//#endif #ifndef __ASSEMBLY__ diff --git a/xen/include/asm-ia64/linux-xen/asm/README.origin b/xen/include/asm-ia64/linux-xen/asm/README.origin index 1073f4d63f..7a50fb9089 100644 --- a/xen/include/asm-ia64/linux-xen/asm/README.origin +++ b/xen/include/asm-ia64/linux-xen/asm/README.origin @@ -17,6 +17,7 @@ pgalloc.h -> linux/include/asm-ia64/pgalloc.h pgtable.h -> linux/include/asm-ia64/pgtable.h processor.h -> linux/include/asm-ia64/processor.h ptrace.h -> linux/include/asm-ia64/ptrace.h +smp.h -> linux/include/asm-ia64/smp.h spinlock.h -> linux/include/asm-ia64/spinlock.h system.h -> linux/include/asm-ia64/system.h tlbflush.h -> linux/include/asm-ia64/tlbflush.h diff --git a/xen/include/asm-ia64/linux/asm/smp.h b/xen/include/asm-ia64/linux-xen/asm/smp.h similarity index 97% rename from xen/include/asm-ia64/linux/asm/smp.h rename to xen/include/asm-ia64/linux-xen/asm/smp.h index a3914352c9..a8a143a54b 100644 --- a/xen/include/asm-ia64/linux/asm/smp.h +++ b/xen/include/asm-ia64/linux-xen/asm/smp.h @@ -46,7 +46,11 @@ ia64_get_lid (void) #define SMP_IRQ_REDIRECTION (1 << 0) #define SMP_IPI_REDIRECTION (1 << 1) +#ifdef XEN +#define raw_smp_processor_id() (current->processor) +#else #define raw_smp_processor_id() (current_thread_info()->cpu) +#endif extern struct smp_boot_data { int cpu_count; diff --git a/xen/include/asm-ia64/linux/asm/README.origin b/xen/include/asm-ia64/linux/asm/README.origin index 7a0e4545a5..c791231cc7 100644 --- a/xen/include/asm-ia64/linux/asm/README.origin +++ b/xen/include/asm-ia64/linux/asm/README.origin @@ -46,7 +46,6 @@ scatterlist.h -> linux/include/asm-ia64/scatterlist.h sections.h -> linux/include/asm-ia64/sections.h semaphore.h -> linux/include/asm-ia64/semaphore.h setup.h -> linux/include/asm-ia64/setup.h -smp.h -> linux/include/asm-ia64/smp.h string.h -> linux/include/asm-ia64/string.h thread_info.h -> linux/include/asm-ia64/thread_info.h timex.h -> linux/include/asm-ia64/timex.h -- 2.30.2